From 4c860a0d3d805813ae8f692587264b1f128cc0c7 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 15 Nov 2003 04:22:16 +0000 Subject: [PATCH] If the window is maximized, use SW_SHOWMAXIMIZED. (#126986, John Ehresman) 2003-11-15 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (gdk_window_focus): If the window is maximized, use SW_SHOWMAXIMIZED. (#126986, John Ehresman) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdk/win32/gdkwindow-win32.c | 5 ++++- 6 files changed, 29 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 93916b63f6..9e317654c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-11-15 Tor Lillqvist + + * gdk/win32/gdkwindow-win32.c (gdk_window_focus): If the window is + maximized, use SW_SHOWMAXIMIZED. (#126986, John Ehresman) + Thu Nov 13 12:55:29 GMT 2003 Tony Gale * docs/faq/gtk-faq.sgml: Update the rest of Section 2 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 93916b63f6..9e317654c2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2003-11-15 Tor Lillqvist + + * gdk/win32/gdkwindow-win32.c (gdk_window_focus): If the window is + maximized, use SW_SHOWMAXIMIZED. (#126986, John Ehresman) + Thu Nov 13 12:55:29 GMT 2003 Tony Gale * docs/faq/gtk-faq.sgml: Update the rest of Section 2 diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 93916b63f6..9e317654c2 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2003-11-15 Tor Lillqvist + + * gdk/win32/gdkwindow-win32.c (gdk_window_focus): If the window is + maximized, use SW_SHOWMAXIMIZED. (#126986, John Ehresman) + Thu Nov 13 12:55:29 GMT 2003 Tony Gale * docs/faq/gtk-faq.sgml: Update the rest of Section 2 diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 93916b63f6..9e317654c2 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2003-11-15 Tor Lillqvist + + * gdk/win32/gdkwindow-win32.c (gdk_window_focus): If the window is + maximized, use SW_SHOWMAXIMIZED. (#126986, John Ehresman) + Thu Nov 13 12:55:29 GMT 2003 Tony Gale * docs/faq/gtk-faq.sgml: Update the rest of Section 2 diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 93916b63f6..9e317654c2 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2003-11-15 Tor Lillqvist + + * gdk/win32/gdkwindow-win32.c (gdk_window_focus): If the window is + maximized, use SW_SHOWMAXIMIZED. (#126986, John Ehresman) + Thu Nov 13 12:55:29 GMT 2003 Tony Gale * docs/faq/gtk-faq.sgml: Update the rest of Section 2 diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c index 78ba305309..6651e54664 100644 --- a/gdk/win32/gdkwindow-win32.c +++ b/gdk/win32/gdkwindow-win32.c @@ -2715,7 +2715,10 @@ gdk_window_focus (GdkWindow *window, GDK_WINDOW_HWND (window), _gdk_win32_window_state_to_string (((GdkWindowObject *) window)->state))); - ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWNORMAL); + if (((GdkWindowObject *) window)->state & GDK_WINDOW_STATE_MAXIMIZED) + ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWMAXIMIZED); + else + ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWNORMAL); SetFocus (GDK_WINDOW_HWND (window)); } -- 2.30.2